From: robertl <robertl>
Date: Tue, 4 May 2010 13:22:17 +0000 (+0000)
Subject: Don't call xcsv setup when we're not dealing with an xcsv file.  Fixes
X-Git-Tag: archive/raspbian/1.10.0+ds-2+rpi1~1^2~199^2
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/success//%22http:/www.example.com/cgi/success/?a=commitdiff_plain;h=27936651d3e246290493e864bfc4ce271e10f955;p=gpsbabel.git

Don't call xcsv setup when we're not dealing with an xcsv file.  Fixes
case of -i csv-something -f non-xcsv-something file1 file2 case.
---

diff --git a/testo.d/classic-1.test b/testo.d/classic-1.test
index d98d95e43..d0b9f8251 100755
--- a/testo.d/classic-1.test
+++ b/testo.d/classic-1.test
@@ -103,6 +103,10 @@ compare ${REFERENCE}/lowrance-v3-unicsv.txt ${TMPDIR}/lowrance-v3-unicsv.txt
 gpsbabel  -i geo -f ${REFERENCE}/../geocaching.loc -o csv -F ${TMPDIR}/csv.csv
 gpsbabel  -i csv -f ${TMPDIR}/csv.csv -o csv -F ${TMPDIR}/csv2.csv
 compare ${TMPDIR}/csv2.csv ${TMPDIR}/csv.csv 
+# And the alternate command line version.
+gpsbabel  -i csv -o gpx ${TMPDIR}/csv.csv ${TMPDIR}/csv3.gpx
+gpsbabel  -i gpx -o csv ${TMPDIR}/csv3.gpx ${TMPDIR}/csv4.csv
+compare ${TMPDIR}/csv.csv ${TMPDIR}/csv4.csv 
 
 #
 # Delorme TopoUSA 4 is a CSV strain.  
diff --git a/vecs.c b/vecs.c
index 09289c43f..9e1cd6180 100644
--- a/vecs.c
+++ b/vecs.c
@@ -1200,7 +1200,7 @@ find_vec(char *const vecname, char **opts)
 			disp_vec_options(vec->name, vec->vec->args);
 		
 #if CSVFMTS_ENABLED		
-		xcsv_setup_internal_style( NULL );
+		// xcsv_setup_internal_style( NULL );
 #endif // CSVFMTS_ENABLED		
 		xfree(v);
 		vec->vec->name = vec->name;	/* needed for session information */